gtk-demo: Add demo of hidpi css assets via -gtk-scaled()

diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index 698372e2f87aafbfc9a66d057b6a383ea5479d47..101071fc69feb305157f6fa7f724a228f3af0aa8 100644 (file)
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -117,6 +117,8 @@ RESOURCES=  $(demos)                        \
                listbox.ui                      \
                alphatest.png                   \
                apple-red.png                   \
+               brick.png                       \
+               brick2.png                      \
                background.jpg                  \
                floppybuddy.gif                 \
                gnome-applets.png               \

diff --git a/demos/gtk-demo/brick.png b/demos/gtk-demo/brick.png
index e5ea7792c9e673b89e0d97282520b91d46225b74..d413cd284b7d7b3b4d869832da405bba0fd5520a 100644 (file)
Binary files a/demos/gtk-demo/brick.png and b/demos/gtk-demo/brick.png differ

diff --git a/demos/gtk-demo/brick2.png b/demos/gtk-demo/brick2.png
new file mode 100644 (file)
index 0000000..cfcd079
Binary files /dev/null and b/demos/gtk-demo/brick2.png differ

diff --git a/demos/gtk-demo/css_multiplebgs.c b/demos/gtk-demo/css_multiplebgs.c
index bb12a236c35b78bb8a57b308b5eed6af03a83f2c..e69ce7784ae15cfadc4abf2a65b7f60cf2957e0c 100644 (file)
--- a/demos/gtk-demo/css_multiplebgs.c
+++ b/demos/gtk-demo/css_multiplebgs.c
@@ -117,7 +117,7 @@ do_css_multiplebgs (GtkWidget *do_widget)
       gtk_widget_set_name (child, "bricks-button");
       gtk_widget_set_halign (child, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (child, GTK_ALIGN_CENTER);
-      gtk_widget_set_size_request (child, 200, 80);
+      gtk_widget_set_size_request (child, 250, 84);
 
       paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
       gtk_overlay_add_overlay (GTK_OVERLAY (container), paned);

diff --git a/demos/gtk-demo/css_multiplebgs.css b/demos/gtk-demo/css_multiplebgs.css
index b23415d12ee0ebdfe2d9bbdd59d3e5be6e969a5f..af10b7c432e83deabf0a2b4b0c1088e3c017cbd4 100644 (file)
--- a/demos/gtk-demo/css_multiplebgs.css
+++ b/demos/gtk-demo/css_multiplebgs.css
@@ -56,7 +56,7 @@
 /*
 #bricks-button {
     background-color: #eef;
-    background-image: url('resource:///css_multiplebgs/brick.png');
+    background-image: -gtk-scaled(url('resource:///css_multiplebgs/brick.png'),url('resource:///css_multiplebgs/brick2.png'));
     background-repeat: no-repeat;
     background-position: center;
 }

diff --git a/demos/gtk-demo/demo.gresource.xml b/demos/gtk-demo/demo.gresource.xml
index 238fbd9496e01a153e5230c7d7f4bf73b61fa104..1a325865237e85f8129ef5f5fb4a336b06dca137 100644 (file)
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -23,6 +23,7 @@
   <gresource prefix="/css_multiplebgs">
     <file>css_multiplebgs.css</file>
     <file>brick.png</file>
+    <file>brick2.png</file>
     <file>cssview.css</file>
     <file>reset.css</file>
   </gresource>